[WIP] Feature/internal/sync map #2109

ykadowak · 2023-07-05T01:55:03Z

Description:

Related Issue:

Versions:

Go Version: 1.20.5
Docker Version: 20.10.8
Kubernetes Version: v1.27.3
NGT Version: 2.0.13

Checklist:

I have read the CONTRIBUTING document and completed our CLA agreement.
I have checked open Pull Requests for the similar feature or fixes?

Special notes for your reviewer:

cloudflare-workers-and-pages · 2023-07-05T01:55:07Z

Deploying with Cloudflare Pages

Latest commit:	`9dee4b0`
Status:	✅ Deploy successful!
Preview URL:	https://54f8c741.vald.pages.dev
Branch Preview URL:	https://feature-internal-sync-map.vald.pages.dev

View logs

vdaas-ci · 2023-07-05T01:55:27Z

[CHATOPS:HELP] ChatOps commands.

🙆‍♀️ /approve - approve
💌 /changelog - replace the PR body by changelog details
🍱 /format - format codes and add licenses
✅ /gen-test - generate test codes
🏷️ /label - add labels
⏪ /rebase - rebase main
🔚 2️⃣ 🔚 /label actions/e2e-deploy - run E2E deploy & integration test

github-actions · 2023-07-05T02:25:09Z

internal/cache/gache/gache.go

-type cache struct {
-	gache          gache.Gache
+type cache[V any] struct {
+	gache          gache.Gache[V]


🚫 [golangci] _{reported by reviewdog 🐶}
gache is unused (structcheck)

github-actions · 2023-07-05T02:25:09Z

internal/singleflight/singleflight.go

@@ -36,7 +38,7 @@ type Group[V any] interface {
 }

 type group[V any] struct {
-	m sync.Map
+	m valdsync.Map[string, *call[V]]


🚫 [golangci] _{reported by reviewdog 🐶}
m is unused (structcheck)

github-actions · 2023-07-05T02:25:09Z

internal/sync/map.go

@@ -0,0 +1,7 @@
+package sync
+
+import gache "github.com/kpango/gache/v2"


🚫 [golangci] _{reported by reviewdog 🐶}
import 'github.com/kpango/gache/v2' is not allowed from list 'Main' (depguard)

github-actions · 2023-07-05T02:25:09Z

internal/cache/gache/gache.go

 	c.gache.StartExpired(ctx, c.expireCheckDur)
 }

 // Get calls StartExpired func of c.gache and returns (interface{}, bool) according to key.
-func (c *cache) Get(key string) (interface{}, bool) {
+func (c *cache[V]) Get(key string) (V, bool) {


🚫 [golangci] _{reported by reviewdog 🐶}
Get returns interface (V) (ireturn)

github-actions · 2023-07-05T02:25:10Z

internal/cache/gache/gache.go

 	c.gache.Delete(key)
 }

 // GetAndDelete returns (interface{}, bool) and delete value according to key when value of key is set.
 // When value of key is not set, returns (nil, false).
-func (c *cache) GetAndDelete(key string) (interface{}, bool) {
+func (c *cache[V]) GetAndDelete(key string) (V, bool) {


🚫 [golangci] _{reported by reviewdog 🐶}
GetAndDelete returns interface (V) (ireturn)

github-actions · 2023-07-05T02:25:11Z

internal/cache/gache/gache_test.go

@@ -554,7 +554,7 @@ func Test_cache_GetAndDelete(t *testing.T) {
 		test := tc
 		t.Run(test.name, func(tt *testing.T) {
 			defer goleak.VerifyNone(tt, goleakIgnoreOptions...)
-			c := &cache{
+			c := &cache[any]{


🚫 [golangci] _{reported by reviewdog 🐶}
variable name 'c' is too short for the scope of its usage (varnamelen)

github-actions · 2023-07-05T02:25:11Z

internal/cache/gache/option_test.go

@@ -119,7 +120,7 @@ func TestWithGache(t *testing.T) {

 	tests := []test{
 		func() test {
-			ga := gache.New()
+			ga := gache.New[any]()


🚫 [golangci] _{reported by reviewdog 🐶}
variable name 'ga' is too short for the scope of its usage (varnamelen)

github-actions · 2023-07-05T02:25:11Z

internal/cache/gache/gache_test.go

 		beforeFunc func(args)
 		afterFunc  func(args)
 	}
-	defaultCheckFunc := func(w want, c *cache) error {
+	defaultCheckFunc := func(w want, c *cache[any]) error {


🚫 [golangci] _{reported by reviewdog 🐶}
parameter name 'w' is too short for the scope of its usage (varnamelen)

github-actions · 2023-07-05T02:25:12Z

internal/cache/gache/option_test.go

 		beforeFunc func(args)
 		afterFunc  func(args)
 	}

-	defaultCheckFunc := func(w want, got *cache) error {
+	defaultCheckFunc := func(w want, got *cache[any]) error {


🚫 [golangci] _{reported by reviewdog 🐶}
parameter name 'w' is too short for the scope of its usage (varnamelen)

github-actions · 2023-07-05T02:25:12Z

internal/cache/gache/gache_test.go

-	defaultCheckFunc := func(w want, got cacher.Cache) error {
-		wc := reflect.ValueOf(w.wantC.(*cache))
-		gc := reflect.ValueOf(got.(*cache))
+	defaultCheckFunc := func(w want, got cacher.Cache[any]) error {


🚫 [golangci] _{reported by reviewdog 🐶}
parameter name 'w' is too short for the scope of its usage (varnamelen)

github-actions · 2023-07-05T02:27:55Z

internal/sync/map.go

+import gache "github.com/kpango/gache/v2"
+
+type Map[K comparable, V any] struct {
+	gache.Map[K,V]


🚫 [golangci] _{reported by reviewdog 🐶}
File is not gofumpt-ed (gofumpt)

github-actions · 2023-07-05T02:27:55Z

internal/net/dialer.go

@@ -34,6 +34,7 @@ import (
 	"github.com/vdaas/vald/internal/observability/trace"
 	"github.com/vdaas/vald/internal/safety"
 	"github.com/vdaas/vald/internal/tls"


🚫 [golangci] _{reported by reviewdog 🐶}
File is not goimports-ed (goimports)

github-actions · 2023-07-05T02:27:56Z

internal/cache/gache/gache_test.go

@@ -454,7 +454,7 @@ func Test_cache_Delete(t *testing.T) {
 		test := tc
 		t.Run(test.name, func(tt *testing.T) {
 			defer goleak.VerifyNone(tt, goleakIgnoreOptions...)
-			c := &cache{
+			c := &cache[any]{


🚫 [golangci] _{reported by reviewdog 🐶}
variable name 'c' is too short for the scope of its usage (varnamelen)

github-actions · 2023-07-05T02:27:56Z

internal/cache/gache/gache_test.go

@@ -360,7 +360,7 @@
 			if test.checkFunc == nil {
 				checkFunc = defaultCheckFunc
 			}
-			c := &cache{
+			c := &cache[any]{


🚫 [golangci] _{reported by reviewdog 🐶}
variable name 'c' is too short for the scope of its usage (varnamelen)

github-actions · 2023-07-05T02:27:56Z

internal/cache/gache/gache_test.go

 		afterFunc  func(args)
 	}
-	defaultCheckFunc := func(w want, c *cache) error {
+	defaultCheckFunc := func(w want, c *cache[any]) error {


🚫 [golangci] _{reported by reviewdog 🐶}
parameter name 'w' is too short for the scope of its usage (varnamelen)

codecov · 2023-07-05T02:32:37Z

Codecov Report

Patch coverage: 86.20% and project coverage change: +0.09 🎉

Comparison is base (a46ac9e) 29.89% compared to head (9dee4b0) 29.98%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2109      +/-   ##
==========================================
+ Coverage   29.89%   29.98%   +0.09%     
==========================================
  Files         369      369              
  Lines       35091    35083       -8     
==========================================
+ Hits        10489    10519      +30     
+ Misses      24118    24083      -35     
+ Partials      484      481       -3

Impacted Files	Coverage Δ
internal/cache/cacher/cacher.go	`100.00% <ø> (ø)`
internal/circuitbreaker/manager.go	`0.00% <0.00%> (ø)`
internal/client/v1/client/discoverer/discover.go	`0.00% <0.00%> (ø)`
internal/client/v1/client/filter/egress/client.go	`0.00% <ø> (ø)`
internal/client/v1/client/filter/ingress/client.go	`0.00% <ø> (ø)`
internal/net/grpc/client.go	`0.00% <0.00%> (ø)`
pkg/gateway/lb/handler/grpc/aggregation.go	`0.00% <ø> (ø)`
pkg/gateway/lb/service/gateway.go	`0.00% <0.00%> (ø)`
pkg/manager/index/service/indexer.go	`0.00% <ø> (ø)`
internal/cache/cache.go	`100.00% <100.00%> (ø)`
... and 5 more

... and 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

github-actions · 2023-07-05T04:34:07Z

internal/cache/gache/gache_test.go

@@ -266,7 +266,7 @@ func Test_cache_Get(t *testing.T) {
 		test := tc
 		t.Run(test.name, func(tt *testing.T) {
 			defer goleak.VerifyNone(tt, goleakIgnoreOptions...)
-			c := &cache{
+			c := &cache[any]{


🚫 [golangci] _{reported by reviewdog 🐶}
variable name 'c' is too short for the scope of its usage (varnamelen)

ykadowak · 2023-07-10T05:41:13Z

continue with #2115

ykadowak and others added 8 commits July 4, 2023 03:44

Update gache

aee8970

make internal/cache generic

70f0040

style: Format code with prettier and gofumpt

aed5069

remove comment

6c72b3a

fix return type

11eb3ab

fix

60229ed

add internal/sync and map.go

5366f3c

replace sync.Map with internal sync.Map

194fd42

style: Format code with prettier and gofumpt

ecea10c

github-actions bot added team/set SET team area/manager/index area/internal area/gateway/lb size/L type/feature New feature priority/medium labels Jul 5, 2023

github-actions bot reviewed Jul 5, 2023

View reviewed changes

Merge branch 'main' into feature/internal/sync-map

9dee4b0

github-actions bot reviewed Jul 5, 2023

View reviewed changes

ykadowak closed this Jul 10, 2023

kpango deleted the feature/internal/sync-map branch May 21, 2024 22:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Feature/internal/sync map #2109

[WIP] Feature/internal/sync map #2109

ykadowak commented Jul 5, 2023

cloudflare-workers-and-pages bot commented Jul 5, 2023 •

edited

Loading

vdaas-ci commented Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

github-actions bot Jul 5, 2023

codecov bot commented Jul 5, 2023 •

edited

Loading

github-actions bot Jul 5, 2023

ykadowak commented Jul 10, 2023

		@@ -0,0 +1,7 @@
		package sync

		import gache "github.com/kpango/gache/v2"

[WIP] Feature/internal/sync map #2109

[WIP] Feature/internal/sync map #2109

Conversation

ykadowak commented Jul 5, 2023

Description:

Related Issue:

Versions:

Checklist:

Special notes for your reviewer:

cloudflare-workers-and-pages bot commented Jul 5, 2023 • edited Loading

Deploying with Cloudflare Pages

vdaas-ci commented Jul 5, 2023

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

codecov bot commented Jul 5, 2023 • edited Loading

Codecov Report

github-actions bot Jul 5, 2023

Choose a reason for hiding this comment

ykadowak commented Jul 10, 2023

cloudflare-workers-and-pages bot commented Jul 5, 2023 •

edited

Loading

codecov bot commented Jul 5, 2023 •

edited

Loading